X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=scripts%2Fupgrade.php;h=ec859e8f43e4c4eb033e305763ebff3c181e7b8b;hb=b15f5f0cafc08c9b63090c5b4f7494fca0634238;hp=1bf444267cd54b7db7c5766c4792161c6ec1cacb;hpb=8c710ad2c1b80544acccb515f7b601aadff2de16;p=quix0rs-gnu-social.git diff --git a/scripts/upgrade.php b/scripts/upgrade.php index 1bf444267c..ec859e8f43 100644 --- a/scripts/upgrade.php +++ b/scripts/upgrade.php @@ -29,11 +29,13 @@ Upgrade database schema and data to latest software END_OF_UPGRADE_HELP; -require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/scripts/commandline.inc.php'; function main() { if (Event::handle('StartUpgrade')) { + fixupConversationURIs(); + updateSchemaCore(); updateSchemaPlugins(); @@ -42,16 +44,20 @@ function main() fixupNoticeRendered(); fixupNoticeConversation(); initConversation(); - initInbox(); fixupGroupURI(); + fixupFileGeometry(); + deleteLocalFileThumbnailsWithoutFilename(); + deleteMissingLocalFileThumbnails(); + initGroupProfileId(); initLocalGroup(); initNoticeReshare(); - initFaveURI(); initSubscriptionURI(); initGroupMemberURI(); + initProfileLists(); + Event::handle('EndUpgrade'); } } @@ -122,7 +128,7 @@ function fixupNoticeConversation() if (empty($notice->reply_to)) { $notice->conversation = $notice->id; } else { - $reply = Notice::staticGet('id', $notice->reply_to); + $reply = Notice::getKV('id', $notice->reply_to); if (empty($reply)) { $notice->conversation = $notice->id; @@ -157,7 +163,7 @@ function fixupGroupURI() if ($group->find()) { while ($group->fetch()) { - $orig = User_group::staticGet('id', $group->id); + $orig = User_group::getKV('id', $group->id); $group->uri = $group->getUri(); $group->update($orig); } @@ -195,44 +201,62 @@ function initConversation() printfnq("DONE.\n"); } -function initInbox() +function fixupConversationURIs() { - printfnq("Ensuring all users have an inbox..."); - - $user = new User(); - $user->whereAdd('not exists (select user_id from inbox where user_id = user.id)'); - $user->orderBy('id'); - - if ($user->find()) { - - while ($user->fetch()) { - - try { - $notice = new Notice(); - - $notice->selectAdd(); - $notice->selectAdd('id'); - $notice->joinAdd(array('profile_id', 'subscription:subscribed')); - $notice->whereAdd('subscription.subscriber = ' . $user->id); - $notice->whereAdd('notice.created >= subscription.created'); + printfnq("Ensuring all conversations have a URI..."); + + $conv = new Conversation(); + $conv->whereAdd('uri IS NULL'); + + if ($conv->find()) { + $rounds = 0; + while ($conv->fetch()) { + $uri = common_local_url('conversation', array('id' => $conv->id)); + $sql = sprintf('UPDATE conversation SET uri="%1$s" WHERE id="%2$d";', + $conv->escape($uri), $conv->id); + $conv->query($sql); + if (($conv->N-++$rounds) % 500 == 0) { + printfnq(sprintf(' %d items left...', $conv->N-$rounds)); + } + } + } - $ids = array(); + printfnq("DONE.\n"); +} - if ($notice->find()) { - while ($notice->fetch()) { - $ids[] = $notice->id; - } - } +function initGroupProfileId() +{ + printfnq("Ensuring all User_group entries have a Profile and profile_id..."); - $notice = null; + $group = new User_group(); + $group->whereAdd('NOT EXISTS (SELECT id FROM profile WHERE id = user_group.profile_id)'); + $group->find(); - $inbox = new Inbox(); - $inbox->user_id = $user->id; - $inbox->pack($ids); - $inbox->insert(); - } catch (Exception $e) { - printv("Error initializing inbox: " . $e->getMessage()); + while ($group->fetch()) { + try { + // We must create a new, incrementally assigned profile_id + $profile = new Profile(); + $profile->nickname = $group->nickname; + $profile->fullname = $group->fullname; + $profile->profileurl = $group->mainpage; + $profile->homepage = $group->homepage; + $profile->bio = $group->description; + $profile->location = $group->location; + $profile->created = $group->created; + $profile->modified = $group->modified; + + $profile->query('BEGIN'); + $id = $profile->insert(); + if (empty($id)) { + $profile->query('ROLLBACK'); + throw new Exception('Profile insertion failed, profileurl: '.$profile->profileurl); } + $group->query("UPDATE user_group SET profile_id={$id} WHERE id={$group->id}"); + $profile->query('COMMIT'); + + $profile->free(); + } catch (Exception $e) { + printfv("Error initializing Profile for group {$group->nickname}:" . $e->getMessage()); } } @@ -279,7 +303,7 @@ function initNoticeReshare() if ($notice->find()) { while ($notice->fetch()) { try { - $orig = Notice::staticGet('id', $notice->id); + $orig = Notice::getKV('id', $notice->id); $notice->verb = ActivityVerb::SHARE; $notice->object_type = ActivityObject::ACTIVITY; $notice->update($orig); @@ -292,35 +316,6 @@ function initNoticeReshare() printfnq("DONE.\n"); } -function initFaveURI() -{ - printfnq("Ensuring all faves have a URI..."); - - $fave = new Fave(); - $fave->whereAdd('uri IS NULL'); - - if ($fave->find()) { - while ($fave->fetch()) { - try { - $fave->decache(); - $fave->query(sprintf('update fave '. - 'set uri = "%s", '. - ' modified = "%s" '. - 'where user_id = %d '. - 'and notice_id = %d', - Fave::newURI($fave->user_id, $fave->notice_id, $fave->modified), - common_sql_date(strtotime($fave->modified)), - $fave->user_id, - $fave->notice_id)); - } catch (Exception $e) { - common_log(LOG_ERR, "Error updated fave URI: " . $e->getMessage()); - } - } - } - - printfnq("DONE.\n"); -} - function initSubscriptionURI() { printfnq("Ensuring all subscriptions have a URI..."); @@ -374,4 +369,134 @@ function initGroupMemberURI() printfnq("DONE.\n"); } +function initProfileLists() +{ + printfnq("Ensuring all profile tags have a corresponding list..."); + + $ptag = new Profile_tag(); + $ptag->selectAdd(); + $ptag->selectAdd('tagger, tag, count(*) as tagged_count'); + $ptag->whereAdd('NOT EXISTS (SELECT tagger, tagged from profile_list '. + 'where profile_tag.tagger = profile_list.tagger '. + 'and profile_tag.tag = profile_list.tag)'); + $ptag->groupBy('tagger, tag'); + $ptag->orderBy('tagger, tag'); + + if ($ptag->find()) { + while ($ptag->fetch()) { + $plist = new Profile_list(); + + $plist->tagger = $ptag->tagger; + $plist->tag = $ptag->tag; + $plist->private = 0; + $plist->created = common_sql_now(); + $plist->modified = $plist->created; + $plist->mainpage = common_local_url('showprofiletag', + array('tagger' => $plist->getTagger()->nickname, + 'tag' => $plist->tag));; + + $plist->tagged_count = $ptag->tagged_count; + $plist->subscriber_count = 0; + + $plist->insert(); + + $orig = clone($plist); + // After insert since it uses auto-generated ID + $plist->uri = common_local_url('profiletagbyid', + array('id' => $plist->id, 'tagger_id' => $plist->tagger)); + + $plist->update($orig); + } + } + + printfnq("DONE.\n"); +} + +/* + * Added as we now store interpretd width and height in File table. + */ +function fixupFileGeometry() +{ + printfnq("Ensuring width and height is set for supported local File objects..."); + + $file = new File(); + $file->whereAdd('filename IS NOT NULL'); // local files + $file->whereAdd('width IS NULL OR width = 0'); + + if ($file->find()) { + while ($file->fetch()) { + // Set file geometrical properties if available + try { + $image = ImageFile::fromFileObject($file); + } catch (ServerException $e) { + // We couldn't make out an image from the file. + continue; + } + $orig = clone($file); + $file->width = $image->width; + $file->height = $image->height; + $file->update($orig); + + // FIXME: Do this more automagically inside ImageFile or so. + if ($image->getPath() != $file->getPath()) { + $image->unlink(); + } + unset($image); + } + } + + printfnq("DONE.\n"); +} + +/* + * File_thumbnail objects for local Files store their own filenames in the database. + */ +function deleteLocalFileThumbnailsWithoutFilename() +{ + printfnq("Removing all local File_thumbnail entries without filename property..."); + + $file = new File(); + $file->whereAdd('filename IS NOT NULL'); // local files + + if ($file->find()) { + // Looping through local File entries + while ($file->fetch()) { + $thumbs = new File_thumbnail(); + $thumbs->file_id = $file->id; + $thumbs->whereAdd('filename IS NULL'); + // Checking if there were any File_thumbnail entries without filename + if (!$thumbs->find()) { + continue; + } + // deleting incomplete entry to allow regeneration + while ($thumbs->fetch()) { + $thumbs->delete(); + } + } + } + + printfnq("DONE.\n"); +} + +/* + * Delete File_thumbnail entries where the referenced file does not exist. + */ +function deleteMissingLocalFileThumbnails() +{ + printfnq("Removing all local File_thumbnail entries without existing files..."); + + $thumbs = new File_thumbnail(); + $thumbs->whereAdd('filename IS NOT NULL'); // only fill in names where they're missing + // Checking if there were any File_thumbnail entries without filename + if ($thumbs->find()) { + while ($thumbs->fetch()) { + if (!file_exists(File_thumbnail::path($thumbs->filename))) { + $thumbs->delete(); + } + } + } + + printfnq("DONE.\n"); +} + main();